Fix CICS connections breaking other ZE sessions #173

AndrewTwydell · 2024-12-17T15:16:48Z

What It Does

Changes method of pulling data from CMCI from Axios HTTP requests to the CICS SDK's getResource and getCache methods
- Removes makeRequest method - refactored response handling
- Refactored getPlexInfo method into smaller methods depending on what's provided in the profile
Removes the global rejectUnauthorized overrides which broke the other ZE sessions
Created toArray utility to replace all cases where we had to do a Array.isArray check

Review Checklist
I certify that I have:

tested my changes
added/updated automated tests
updated the changelog
followed the contribution guidelines

Additional Comments
Resolves #159
Resolves #124

codecov-commenter · 2024-12-17T15:17:55Z

Codecov Report

Attention: Patch coverage is 21.18227% with 160 lines in your changes missing coverage. Please review.

Project coverage is 28.20%. Comparing base (18afd7c) to head (a7c83f1).
Report is 15 commits behind head on main.

Files with missing lines	Patch %	Lines
packages/vsce/src/utils/profileManagement.ts	20.68%	92 Missing ⚠️
...trees/CICSCombinedTrees/CICSCombinedProgramTree.ts	20.00%	12 Missing ⚠️
...es/vsce/src/trees/treeItems/CICSLibraryTreeItem.ts	27.27%	8 Missing ⚠️
.../CICSCombinedTrees/CICSCombinedTCPIPServiceTree.ts	25.00%	3 Missing ⚠️
...rc/trees/CICSCombinedTrees/CICSCombinedTaskTree.ts	25.00%	3 Missing ⚠️
.../trees/CICSCombinedTrees/CICSCombinedURIMapTree.ts	25.00%	3 Missing ⚠️
...es/CICSCombinedTrees/CICSCombinedWebServiceTree.ts	25.00%	3 Missing ⚠️
packages/vsce/src/trees/CICSRegionsContainer.ts	25.00%	3 Missing ⚠️
...trees/CICSCombinedTrees/CICSCombinedLibraryTree.ts	33.33%	2 Missing ⚠️
...ees/CICSCombinedTrees/CICSCombinedLocalFileTree.ts	33.33%	2 Missing ⚠️
... and 18 more

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #173      +/-   ##
==========================================
+ Coverage   27.73%   28.20%   +0.47%     
==========================================
  Files         147      147              
  Lines        5218     5113     -105     
  Branches      915      889      -26     
==========================================
- Hits         1447     1442       -5     
+ Misses       3771     3671     -100

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

davenice

Couple of thoughts - look generally good though.

packages/vsce/src/trees/treeItems/CICSLibraryTreeItem.ts

AndrewTwydell · 2025-01-07T14:48:56Z

packages/vsce/src/trees/CICSRegionsContainer.ts

@@ -93,11 +89,12 @@ export class CICSRegionsContainer extends TreeItem {
   * Count the number of total and active regions
   * @param regionsArray
   */
-  private addRegionsUtility(regionsArray: [any]) {
+  private addRegionsUtility(regionsArray: any[]) {


[any] is an incorrect type (indicated an array with 1 item of type any)

AndrewTwydell · 2025-01-08T16:27:45Z

@zFernand0 I'd like your opinion on this as it resolves an issue you found relating to self-signed certs.

Majority of changes are in profileManagement.ts as it moves from Axios to the SDK which comes with changes in errors and response types. Lots of files are touched however because of the https import removal.

With the current lack of automated testing (WIP), I'm recruiting as many people as possible to manually test this (@davenice, @enamkhan, @chinmdas, amongst others) but the more the merrier!

I intend to squash my messy commits before merging 👍🏼

zFernand0

Overall, LGTM! 😋

Thanks for fixing up all the typing issues. 🙏
And also for creating the common toArray function 🥳
Finally, thanks a lot for removing axios! 🙏

I know the primary purpose was to avoid messing with the reject unauthorized configuration of the https package, but I'm really happy with the little refactoring that happened here 🙏

.editorconfig

zFernand0 · 2025-01-08T16:40:23Z

packages/vsce/src/commands/enableCommands/enableTransactionCommand.ts

@@ -99,7 +95,7 @@ export function getEnableTransactionCommand(tree: CICSTree, treeview: TreeView<a
  });
 }

-async function enableTransaction(session: imperative.AbstractSession, parms: { name: string; regionName: string; cicsPlex: string }): Promise<ICMCIApiResponse> {
+async function enableTransaction(session: imperative.AbstractSession, parms: { name: string; regionName: string; cicsPlex: string; }): Promise<ICMCIApiResponse> {


It seems that this is a common interface...
{ name: string; regionName: string; cicsPlex: string; }

Curious if we can type it as one 😋

Also, I know I have a draft PR (#14) about migrating a lot of these SDK-like functions to the packages/sdk but I'm afraid that such PR might be a bit ambitious and also out of date 😋

I don't mind making some more updates and reducing the scope of it, if y'all would like 😋

Curious if we can type it as one

Good plan, I'll add that onto this PR while we're already touching those methods.

Also, I know I have a draft PR (#14) about migrating a lot of these SDK-like functions to the packages/sdk but I'm afraid that such PR might be a bit ambitious and also out of date 😋

Now I'm more familiar with the monorepo I'll look over what you've got and comment over there. Seems silly to waste effort you've already done! 😎

zFernand0 · 2025-01-08T17:04:10Z

@zFernand0 I'd like your opinion on this as it resolves an issue you found relating to self-signed certs.

My apologies for taking so long, 😅
But I really like what's going on in this PR 🙏

I intend to squash my messy commits before merging 👍🏼

Similar to Zowe Explorer, I think we don't have to worry about constantly force-pushing to your own branch and instead, we can choose to squash PRs when merging (as Dave suggested on another PR conversation/thread).

Great work on this! 🙏

zFernand0 · 2025-01-08T17:05:56Z

With the current lack of automated testing (WIP), I'm recruiting as many people as possible to manually test this (@davenice, @enamkhan, @chinmdas, amongst others) but the more the merrier!

I'd love to see other people's thoughts/comments about their review/testing as well 🙏

packages/vsce/src/trees/CICSCombinedTrees/CICSCombinedProgramTree.ts

AndrewTwydell · 2025-01-08T17:47:00Z

Similar to Zowe Explorer, I think we don't have to worry about constantly force-pushing to your own branch and instead, we can choose to squash PRs when merging (as Dave suggested on another PR conversation/thread).

I'm a fan of a tidy commit history so a habit I've found myself in! More for me than anything else 😂

davenice · 2025-01-08T18:37:06Z

I've had a go with:

two separate hosts in play for z/OSMF, one with proper cert and one self-signed - both secured
cicsplexes on one of the hosts - one with security (incl self signed ssl) and one without security

I can access all of these systems at once without an issue.

i'm seeing a possible regression around what happens if you connect to a plex but specify a regionName - it seems to be displaying the "All Programs" and similar menus, and nesting everything as if it's a whole plex.

AndrewTwydell · 2025-01-08T18:41:22Z

Good find @davenice! Will take a look now... Is that where you've specified a plex and region in the profile, not through any filtering

davenice · 2025-01-08T19:06:39Z

Good find @davenice! Will take a look now... Is that where you've specified a plex and region in the profile, not through any filtering

yes that's right - I think the issue is in profileManagement where we're deciding whether we've specified a region or group, the code is thinking we specified a group.

packages/vsce/src/utils/profileManagement.ts

davenice · 2025-01-08T22:42:04Z

OK - so I think we've resolved the issues we know about. I've tested with SMSS now (had forgotten that before).

Is there much else remaining to snag on this, @AndrewTwydell? I aspire to us getting this in this week ... if it's safe :-)

AndrewTwydell · 2025-01-09T09:55:56Z

Nothing more that's been mentioned or found, and lots of manual testing has now been done. Seems I've got some fun conflicts to resolve later and we can hopefully get it in this afternoon after a final nod from the reviewers 🙂 Be very good to finally have this problem sorted!!!

Signed-off-by: Andrew Twydell <[email protected]>

Co-authored-by: Dave Nice <[email protected]> Signed-off-by: Andrew <[email protected]>

davenice · 2025-01-09T15:20:01Z

Hey @zFernand0 - @enamkhan, @AndrewTwydell and I have given this a bash along with another dev who was seeing some of the issues.

We're pretty confident that this is an improvement now (within the bounds that there isn't much automated testing).

We'd like to get this in - are you happy?

zFernand0 · 2025-01-09T15:27:03Z

We're pretty confident that this is an improvement now (within the bounds that there isn't much automated testing).

We'd like to get this in - are you happy?

100%
Thank you all for giving this a try and special shoutout to Andrew for the refactoring (and removing axios 🙏 )

github-actions · 2025-01-09T15:36:59Z

Release succeeded for the main branch with some errors. ⚠️

The following packages have been published:

vsce: [email protected]
vsce: ❌ [email protected] (OVSX)

_{Powered by Octorelease 🚀}

github-actions bot assigned AndrewTwydell Dec 17, 2024

AndrewTwydell force-pushed the sdk-cache branch 2 times, most recently from 85531d9 to d3b74e1 Compare December 18, 2024 11:21

AndrewTwydell force-pushed the fix-global-ru-overrides branch from 39b54e9 to 7e3de0a Compare December 18, 2024 12:02

davenice reviewed Dec 18, 2024

View reviewed changes

packages/vsce/src/trees/treeItems/CICSLibraryTreeItem.ts Outdated Show resolved Hide resolved

AndrewTwydell force-pushed the fix-global-ru-overrides branch from 37980ec to 21eb530 Compare December 18, 2024 13:53

Base automatically changed from sdk-cache to main December 18, 2024 14:45

AndrewTwydell force-pushed the fix-global-ru-overrides branch 2 times, most recently from e9be358 to 10de456 Compare December 18, 2024 18:48

AndrewTwydell force-pushed the fix-global-ru-overrides branch 2 times, most recently from 2509799 to 9c7abfc Compare January 7, 2025 12:08

AndrewTwydell commented Jan 7, 2025

View reviewed changes

AndrewTwydell force-pushed the fix-global-ru-overrides branch 2 times, most recently from 999ab88 to 7614a24 Compare January 8, 2025 10:17

AndrewTwydell marked this pull request as ready for review January 8, 2025 16:23

AndrewTwydell requested review from zFernand0, enamkhan and davenice January 8, 2025 16:23

zFernand0 approved these changes Jan 8, 2025

View reviewed changes

enamkhan reviewed Jan 8, 2025

View reviewed changes

packages/vsce/src/trees/CICSCombinedTrees/CICSCombinedProgramTree.ts Show resolved Hide resolved

enamkhan approved these changes Jan 8, 2025

View reviewed changes

davenice reviewed Jan 8, 2025

View reviewed changes

packages/vsce/src/utils/profileManagement.ts Outdated Show resolved Hide resolved

davenice reviewed Jan 8, 2025

View reviewed changes

packages/vsce/src/utils/profileManagement.ts Outdated Show resolved Hide resolved

AndrewTwydell force-pushed the fix-global-ru-overrides branch from 7614a24 to 1f3eb1e Compare January 8, 2025 22:31

github-advanced-security bot found potential problems Jan 8, 2025

View reviewed changes

packages/vsce/src/utils/profileManagement.ts Fixed Show fixed Hide fixed

AndrewTwydell force-pushed the fix-global-ru-overrides branch from 1984e89 to 68d18e6 Compare January 8, 2025 22:38

AndrewTwydell force-pushed the fix-global-ru-overrides branch from 68d18e6 to f770bb9 Compare January 9, 2025 13:54

AndrewTwydell added 11 commits January 9, 2025 15:05

create toArray utility

116ecf9

Signed-off-by: Andrew Twydell <[email protected]>

remote https global overrides

2cd96f9

Signed-off-by: Andrew Twydell <[email protected]>

move profileManagement to getResource SDK

a949bc7

Signed-off-by: Andrew Twydell <[email protected]>

move getCachedResources to getCache SDK method

d3cf0c4

Signed-off-by: Andrew Twydell <[email protected]>

library tree item label builder

d4f587b

Signed-off-by: Andrew Twydell <[email protected]>

regionsArray is list of any, not list with single item of any

209f465

Signed-off-by: Andrew Twydell <[email protected]>

remove unnecessary imports

973a649

Signed-off-by: Andrew Twydell <[email protected]>

update recordCount to be number

ef2dacc

Signed-off-by: Andrew Twydell <[email protected]>

profileManagement refactor

b50a886

Signed-off-by: Andrew Twydell <[email protected]>

add changelog entry

4556bab

Signed-off-by: Andrew Twydell <[email protected]>

consolidate command types to interface

0ef0905

Signed-off-by: Andrew Twydell <[email protected]>

AndrewTwydell force-pushed the fix-global-ru-overrides branch 2 times, most recently from b6f5401 to 2dc70f0 Compare January 9, 2025 15:09

handle system group response

a7c83f1

Co-authored-by: Dave Nice <[email protected]> Signed-off-by: Andrew <[email protected]>

AndrewTwydell force-pushed the fix-global-ru-overrides branch from 2dc70f0 to a7c83f1 Compare January 9, 2025 15:10

zFernand0 merged commit 106365f into main Jan 9, 2025
19 checks passed

zFernand0 deleted the fix-global-ru-overrides branch January 9, 2025 15:27

zFernand0 added the release-patch Indicates a patch to existing code has been applied label Jan 9, 2025

github-actions bot added the released label Jan 9, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix CICS connections breaking other ZE sessions #173

Fix CICS connections breaking other ZE sessions #173

AndrewTwydell commented Dec 17, 2024 •

edited

Loading

codecov-commenter commented Dec 17, 2024 •

edited

Loading

davenice left a comment

AndrewTwydell Jan 7, 2025

AndrewTwydell commented Jan 8, 2025

zFernand0 left a comment

zFernand0 Jan 8, 2025

AndrewTwydell Jan 8, 2025

zFernand0 commented Jan 8, 2025

zFernand0 commented Jan 8, 2025

AndrewTwydell commented Jan 8, 2025

davenice commented Jan 8, 2025

AndrewTwydell commented Jan 8, 2025

davenice commented Jan 8, 2025

davenice commented Jan 8, 2025

AndrewTwydell commented Jan 9, 2025

davenice commented Jan 9, 2025

zFernand0 commented Jan 9, 2025

github-actions bot commented Jan 9, 2025

Fix CICS connections breaking other ZE sessions #173

Fix CICS connections breaking other ZE sessions #173

Conversation

AndrewTwydell commented Dec 17, 2024 • edited Loading

codecov-commenter commented Dec 17, 2024 • edited Loading

Codecov Report

davenice left a comment

Choose a reason for hiding this comment

AndrewTwydell Jan 7, 2025

Choose a reason for hiding this comment

AndrewTwydell commented Jan 8, 2025

zFernand0 left a comment

Choose a reason for hiding this comment

zFernand0 Jan 8, 2025

Choose a reason for hiding this comment

AndrewTwydell Jan 8, 2025

Choose a reason for hiding this comment

zFernand0 commented Jan 8, 2025

zFernand0 commented Jan 8, 2025

AndrewTwydell commented Jan 8, 2025

davenice commented Jan 8, 2025

AndrewTwydell commented Jan 8, 2025

davenice commented Jan 8, 2025

davenice commented Jan 8, 2025

AndrewTwydell commented Jan 9, 2025

davenice commented Jan 9, 2025

zFernand0 commented Jan 9, 2025

github-actions bot commented Jan 9, 2025

AndrewTwydell commented Dec 17, 2024 •

edited

Loading

codecov-commenter commented Dec 17, 2024 •

edited

Loading